From 68e994a7ed2cf3a2749f221a23bac8074ac22192 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 2 Sep 2005 17:53:34 +0000 Subject: [PATCH] We need to be more precise and restore the %eip. Signed-Off-By: Leendert van Doorn --- xen/arch/x86/vmx.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c index b192bb05e6..ecce93d60c 100644 --- a/xen/arch/x86/vmx.c +++ b/xen/arch/x86/vmx.c @@ -1559,15 +1559,18 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs regs) __vmread(IDT_VECTORING_INFO_FIELD, &idtv_info_field); if (idtv_info_field & INTR_INFO_VALID_MASK) { - if ((idtv_info_field & 0x0700) != 0x400) { /* exclude soft ints */ - __vmwrite(VM_ENTRY_INTR_INFO_FIELD, idtv_info_field); - - if (idtv_info_field & 0x800) { /* valid error code */ - unsigned long error_code; - __vmread(VM_EXIT_INTR_ERROR_CODE, &error_code); - __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code); - } - } + __vmwrite(VM_ENTRY_INTR_INFO_FIELD, idtv_info_field); + + __vmread(VM_EXIT_INSTRUCTION_LEN, &inst_len); + if (inst_len >= 1 && inst_len <= 15) + __vmwrite(VM_ENTRY_INSTRUCTION_LEN, inst_len); + + if (idtv_info_field & 0x800) { /* valid error code */ + unsigned long error_code; + __vmread(IDT_VECTORING_ERROR_CODE, &error_code); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code); + } + VMX_DBG_LOG(DBG_LEVEL_1, "idtv_info_field=%x", idtv_info_field); } -- 2.30.2